New installed file with babl_init() and babl_destroy() declarations.

* babl/babl-main.h: New installed file with babl_init() and
babl_destroy() declarations.

* babl/babl.h: Include it.

* babl/Makefile.am: Add it.

svn path=/trunk/; revision=368

diff --git a/ChangeLog b/ChangeLog
index 22312fffd7838af9371b4343752801855ba2e021..5a28fe4aea43d31b281073c7725b236f8d85864a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-01-17  Martin Nordholts  <martinn@svn.gnome.org>
+
+       * babl/babl-main.h: New installed file with babl_init() and
+       babl_destroy() declarations.
+
+       * babl/babl.h: Include it.
+
+       * babl/Makefile.am: Add it.
+
 2009-01-17  Martin Nordholts  <martinn@svn.gnome.org>
 
        * babl/babl-macros.h: New installed header file that contains

diff --git a/babl/Makefile.am b/babl/Makefile.am
index c0a7c43b6851ae9a2f3401f88148f06b02281048..bf523916972635ed33ff8cf1f36ecbd617d4f9a4 100644 (file)
--- a/babl/Makefile.am
+++ b/babl/Makefile.am
@@ -38,6 +38,7 @@ h_sources  =                          \
        babl-ids.h                      \
        babl-internal.h                 \
        babl-macros.h                   \
+       babl-main.h                     \
        babl-memory.h                   \
        babl-util.h                     \
        babl.h                          \
@@ -55,6 +56,7 @@ library_include_HEADERS =             \
        babl-format.h                   \
        babl-image.h                    \
        babl-macros.h                   \
+       babl-main.h                     \
        babl-model.h                    \
        babl-sampling.h                 \
        babl-type.h                     \

diff --git a/babl/babl-main.h b/babl/babl-main.h
new file mode 100644 (file)
index 0000000..e0a7fa3
--- /dev/null
+++ b/babl/babl-main.h
@@ -0,0 +1,35 @@
+/* babl - dynamically extendable universal pixel conversion library.
+ * Copyright (C) 2005-2008, Øyvind Kolås and others.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _BABL_MAIN_H
+#define _BABL_MAIN_H
+
+#ifndef _BABL_H
+#error  this file is only to be included by babl.h
+#endif
+
+/** Initialize the babl library */
+void   babl_init       (void);
+
+/** Deinitialize the babl library (frees any resources used, if the number
+ *  of calls to babl_destroy() is is equal to the number of calls to
+ *  babl_init()
+ */
+void   babl_destroy    (void);
+
+#endif

diff --git a/babl/babl.h b/babl/babl.h
index dfc17901b56c64d093884b7c8312d22643fb9912..a1e99a164953556fe372775bf803a65518b9e485 100644 (file)
--- a/babl/babl.h
+++ b/babl/babl.h
@@ -31,6 +31,7 @@
 #endif
 
 #include "babl-macros.h"
+#include "babl-main.h"
 
 /* magic number used at the start of all babl objects, used to do
  * differentiation in polymorphic functions. (as well as manual
@@ -76,15 +77,6 @@ typedef union _Babl Babl;
 
 typedef struct _BablList BablList;
 
-/** Initialize the babl library */
-void   babl_init       (void);
-
-/** Deinitialize the babl library (frees any resources used, if the number
- *  of calls to babl_destroy() is is equal to the number of calls to
- *  babl_init()
- */
-void   babl_destroy    (void);
-
 typedef int  (*BablEachFunction) (Babl *entry,
                                   void *data);